More accurately use action roles so buttons are in the right order.

Remove graphics from all but Windows.
Add help on main page.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4751 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/gui/mainwindow.cc b/gpsbabel/gui/mainwindow.cc
index 63fe218b66014e1cda5b2cb317391d9497235edb..9e1f1e94e7e4ff3eb1426eaa848e5e8f858639e7 100644 (file)
--- a/gpsbabel/gui/mainwindow.cc
+++ b/gpsbabel/gui/mainwindow.cc
@@ -186,17 +186,20 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
   connect(ui_.moreOptionButton , SIGNAL(clicked()),
          this,                 SLOT(moreOptionButtonClicked()));
 
-  connect(ui_.buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()), this, SLOT(applyActionX()));
+  connect(ui_.buttonBox, SIGNAL(accepted()), this, SLOT(applyActionX()));
   connect(ui_.buttonBox, SIGNAL(rejected()), this, SLOT(closeActionX()));
+  connect(ui_.buttonBox, SIGNAL(helpRequested()), this, SLOT(helpActionX()));
+
   connect(ui_.xlateFiltersBtn, SIGNAL(clicked()), this, SLOT(filtersClicked()));
 
   connect(ui_.inputFileNameText, SIGNAL(textEdited(QString)), this, SLOT(inputFileNameEdited()));
   connect(ui_.outputFileNameText, SIGNAL(textEdited(QString)), this, SLOT(outputFileNameEdited()));
 
-
-  ui_.buttonBox->button(QDialogButtonBox::Apply)->setIcon(QIcon(":images/runit.png"));
+#if defined (Q_OS_WIN)
+  // Windows users like the colored buttons.  They look out of place elsewhere.
+  ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/runit.png"));
   ui_.buttonBox->button(QDialogButtonBox::Close)->setIcon(QIcon(":images/exit.png"));
-
+#endif
 
   ui_.inputOptionsText->setReadOnly(true);
   ui_.outputOptionsText->setReadOnly(true);

diff --git a/gpsbabel/gui/mainwinui.ui b/gpsbabel/gui/mainwinui.ui
index a8c6d8138a45a3c62326167085a5c6074a715330..1e7fb045d6e89c5961557845775d410c04ac2923 100644 (file)
--- a/gpsbabel/gui/mainwinui.ui
+++ b/gpsbabel/gui/mainwinui.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>674</width>
+    <width>675</width>
     <height>582</height>
    </rect>
   </property>
@@ -622,7 +622,7 @@
        <string/>
       </property>
       <property name="standardButtons">
-       <set>QDialogButtonBox::Apply|QDialogButtonBox::Close</set>
+       <set>QDialogButtonBox::Close|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
       </property>
      </widget>
     </item>
@@ -633,7 +633,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>674</width>
+     <width>675</width>
      <height>22</height>
     </rect>
    </property>